Elliptics 2.20 compatibility