SONAR-3837 Improve violation tracking mechanism