fix mem leakage and discussions of MR !569

m.puchnerrequested to merge
MR569addOn into develop

Implement things from my review of !569 (merged)

Edited by m.puchner

Merge request reports