Bug fixing: base url
Merge remote-tracking branch 'origin/release-candidate' into develop