Merge "Upstream sync." into main