fix the issue
Merge branch 'hotfix/fix_user_order_redirection_error'