[EFL] Unreviewed gardening on 22th April