Fixed paths to be relative instead of absolute
Merge branch 'api_build', remote-tracking branch 'origin/api_build' into api_build