Thanks to Nico for the contribution in !43 (merged). Making this MR in order to have the pipeline be tested