Merge latest changes (Drupal support)