bug fix on base_url method
Merge branch 'dev' into base-build