Revert "Merge branch 'master' of c:/workspaces/gitRepos/FlexibleOrders"

This reverts commit 0e7c1f5e4852e53f7981e92cfaf1aff9e8a94177, reversing
changes made to 6ffa244694195b0e3f419cf7320ec7c65d048d99.