[Upstream migration @62307] Merge remote branch 'origin/upstream'