This MR address many of the issues outlined in
https://redmine.cbm.gsi.de/issues/2786
whilst some remaining to be address in the future are recorded in
https://redmine.cbm.gsi.de/issues/3139
Information regarding the changes brought in by this MR may be seen in the presentations