Merge remote branch 'internal/upstream' into HEAD