ENG-4536 Elastic scanner