Merge pull request #20681 from eileenmcnaughton/order_easy