INFR-25347 - Ticket