Merge "reduce sonar issue - 2 rev"