Wip 5898

Work-in-progress.

/see #5858