Preparations for sample editor

m.puchnerrequested to merge
prep1_SampleEditor into develop

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

Merge request reports