Merge pull request #13691 from eileenmcnaughton/record_extract