Merge "Moved base client to new location" into dublin