Merge "Fix sonar issue Password"