Prevent redirection
Merge branch 'develop'
Remove ensure_domain.