Merge "Remove erroneous duplicate baseline entry" into main