Merge "Fix sonar issues + merge"