Merge "Fixing vulnerabilities and code smells"