sonar fix:blocker issues in MsbMgmrImpl