port ES changes from Bitshares

https://github.com/bitshares/bitshares-core/issues/2240

Assignee Loading
Time tracking Loading