Merge "Baseline some build errors during finalization" into main