[eclass] Sync with tree