Rework to match tools repo

Anthony Bretaudeau requested to merge sync_with_tools into preprod Oct 25, 2021