Add the possibility to bypass baseUrl
Merge