DRUPAL-12 commit 5