Merge "Fix sonar new bugs and vulnerabilities"