Merge pull request #18217 from mattwire/orderapicleanup