Issue #21323:change timing for handling supply orders to avoid signal co...

...nflicts