This is just to track the evolution of the wip/T13861 branch even if I push with --force, so there is no danger of losing commits.
wip/T13861
--force
Later, when done, this can be landed, hopefully.