INFR-25344 - Fix merge