Merge "Adding relative path support"