Merge Nicolas PR from futur master

The old PR is included in this one and can then be closed.