Various
Upgrade elasticsearch reference