#36 Backport version 1.3.5 to ES 0.90.5