INFR-25347 - Fix