More simplifications for SampleDesigner Toolbox

m.puchnerrequested to merge
SimplifySampleDesigner2 into develop

Please read the commit comments for details

Merge request reports