Fix order status check
Merge branch 'master' into deploy

* master:
  Fix order status check