Fix a typo
Fix url concatenation
Merge branch 'master' into qa03