Make sure ?___SID=U is removed from redirect url.
Merge branch 'bugfix/remove_sid_redirect_url'