Preparations for sample editor

Clean up and a few changes to be used in the upcoming sample editor

assigned to @t.knopff

requested review from @t.knopff

approved this merge request

assigned to @m.puchner and unassigned @t.knopff

mentioned in commit a3596d24

merged