Remove whitespaces
Avoid unnecessarily redirect
Merge pull request #4037 from marpo60/avoid_redirect

Avoid redirect