Fixed bug with global url path
Merge branch 'master' into async-submit