Merge branch 'feature/order-notify-user-email' into develop