implements #18388
Not yet testable in the UI, needs @taw 's MR !718 (merged) which sets the correct output mode.
