adaptations for drupal8 alpha10 code base