Merge "Fixing nexus sonar scan issues"