Keeping up with recent changes in Drupal core.
Keeping up with recent changes in Drupal core.
Merged from origin.