Issue #22676:undo 17134 changes and order inventory availability by sche
Merge pull request #1386 from shackbarth/22676

Issue #22676:undo 17134 changes and order inventory availability by sche