Merge pull request #13448 from eileenmcnaughton/everyone_510