[merge] with https://gitlab.cern.ch/simonspa/corryvreckan/commit/a9270b437143210f19285089299035387c865538