Merge "Sonar Fix: Marked field as private"