Merge pull request #8636 from eileenmcnaughton/slow_query