Merge "Correct star name on post-U builds." into main