Merge "Fix new sonar vulnerabilities"