DRUPAL-12 demo commit 2