BREAKING: Use ES class; drop inherits
dep
#530
+837
−872
Merged
inherits
dep
#530