Ported to drupal8-alpha14