Latest changes from master

Can't show this merge request because the target branch 13-introduce-mc-smearing-digitization-effects is missing from project P348/p348-daq. Close this merge request or update the target branch.