Closes #3516532
To be reviewed with Issue: https://gitlab.com/drupal-infrastructure/sites/drupalorg/-/issues/69