Merge pull request #2111 from TheBlueMatt/2023-03-sent-persist-order-prep