Merge "DO NOT MERGE: manually cherry pick" into main