I think we should add @loicdescotte and me as well. Maybe not in this PR.