DRUPAL-12 commit 4