Merge "fixing Critical Sonar Issue"