Merge "Fix for sonar issue"