rebase development

Stauff, Nicolas Emilerequested to merge
development into detailed_1d_geom

update new branch to pass unit-tests

Merge request reports