Merge pull request #13451 from eileenmcnaughton/everyone_510