Draft: Rnou/fix verbs

Ramon Nourequested to merge
rnou/fix_verbs into master

Merge request reports