JARVIS-479 Fixed issue with relative paths
Merge branch 'origin/develop'