Merge only after drupal-runtime!22 (merged)
changed the description
merged
mentioned in commit aece0655