Merge "Trim root path from output"