Backport version 1.5.4 to ES 0.90.5 #44