[3.8] Tickets fixes