Drupal core issue is now merged