Merge branch 'hotfix/base-url-fix' into develop