The MR fixes the redmine issue: https://redmine.cbm.gsi.de/issues/2128
MR should be merged after !426 (merged)