INFR-25344 - Tooltip ticket