https://www.drupal.org/project/drupal_cms/issues/3487391 implements the proposal at https://www.drupal.org/project/drupal_cms/issues/3461533