Merge "Sonar defect issues IssueId: SO-118"