ENG-5434 better VEM support for elastic join