Adds more inform to violation exception
Merge branch '2.0-maint'