For ENG-6369, changes based on code review.