WIP: First attempt of merging future into master

This is not intended to be merged but will serve as a debugging exercise. It will thus stay as WIP and be labeled for lhcb-gaudi-head for the moment