[#49584777] Fix infinte redirect for domain different than localhost
Merge remote-tracking branch 'origin/master'