Merge branch 'cl-ctx-param' into 'master'

Documentation fixes / Discretization doc improvements

See merge request !17