Merge "Sonar Fix - added static for the fields"