temporary branch not to be merged! (copy of !782 for future)

This branch is based on the branch merging master into future see !785 (merged).
On top of that, I only merged what is in !782 (merged) and resolved the merge conflict.

The goal is simply to have this in the nightlies to start debugging the future tests.

This branch will NOT be merged, but the change will eventually come with another merge from master into future.