See merge request !141

Co-authored-by: ornanovitch <ornano@felinn.org>
Co-authored-by: kaiyou <dev@kaiyou.fr>
Co-authored-by: Cyril Levis <git@levis.name>