Fix redirectUrl to work with studio
Merge branch 'master' into 'MasterBugFixing'