Synced to upstream 5.5.33a