Pinging @florent since I do not remember the best approach in that case.