Merge "Fix DuplicateBranches errorprone issue" into main