Merge pull request #14260 from eileenmcnaughton/spec