ENG-4819 ENG-5102 Minor nit on a variable definition