Feature/improve handbook discretization

Merge request reports