#1390 [Agalya/Simon] Change base_path construction  from uri