Merge "Sonar fix: make "dateFormat" an instance variable"