Fix redirect issue
Merge origin/master