Resolved #6 All sonar vioalations was fixed.