Merge "Allow relative path as 'local' argument"