Merge "Fix some Sonar issue in common directory"