Merge "fixed sonar critical issue"