Just Juan's for now, can't review the other one (b...

# kobalt

[cedric]

Just Juan's for now, can't review the other one (but I trust your judgment if you think the second one is good to merge too)