Merge Changes from Official Repo of Drupal

Merge changes from official repo of Drupal.