Fix: https://www.drupal.org/project/dashboards/issues/3349570
- Fix: https://www.drupal.org/project/dashboards/issues/3347975