[prod] 23.1 and tpv fixes

Anthony Bretaudeau requested to merge preprod into master Jan 22, 2024