Merge "bmpn sonar issue fix IssueId: SO-118"