Merge branch 'hotfix/1.1.3'
Fix an issue with custom base urls
Merge branch 'hotfix/1.1.4' into develop