master to future merge
Another iteration of it. Big clashes around DetDesc due to the collision of the thread safety modifications done long ago on future and the recent "modernization" on master. To be avoided in the future.
Another iteration of it. Big clashes around DetDesc due to the collision of the thread safety modifications done long ago on future and the recent "modernization" on master. To be avoided in the future.