Solve displacement subproblem first in OS

Merged Gräser, Carsten requested to merge feature/os-solve-displacement-first into master

Merge request reports