Ninja url production fixes
Merge branch 'master' into develop