Merge pull request #6279 from eileenmcnaughton/d8