[EFL] Unreviewed gardening on 29th May