Make it concurrency-safe
Merge branch 'fix/order-update-concurrency' into 2-1-dev