Merge "BUG-2661: Sonar issue"