Merge branch 'master' into develop
[+BUGFIX] added missing url suffix variable
Merge branch 'develop'