Merged base_url changes.