#42 Backport version 1.5.3 to ES 0.90.5