For ENG-4398 and ENG-4397, add hash function support for elastic