Merge "Fix Sonar Issue"