[Design] Use design from arnaudlevy
Merge