Merge pull request #8011 from neheb/ar