Merge pull request #13571 from eileenmcnaughton/book