This change is a dependency for Wendelin MR https://lab.nexedi.com/nexedi/wendelin/merge_requests/100.
Tests are currently running.