NN-10534: make it working at latest drupal 8 dev