Interpreting the URL end part as the client name
Merged changes