Activates ProxyPreserveHost
Undo preserve host
Merge branch 'master' into develop