ENG-6475, for initial review