Merge to upstream 691026242b81aceac4805322e2a51cb5ccbb6766