hotfix 1207 changed base uri
Merge branch 'hotfix/fix_1207'