Merge pull request #4359 from Segrain/master

Bugfixes.
Double call removal.
Sanity checks.
Verb category.
Surgery tracking.