Synced to upstream 5.5.33
Synced to upstream 5.5.33
Manual merge