Start work on resolve url on servers
Merge