Merge "Sonar issues fixes in Validator"