Merge "Baseline issues that were previously suppressed" into main