Fixes for bug #52499: Field polarities inconsistiency