RFC, do not merge yet

To discuss