Merge "Add v3 filepaths to baseline" into main