ENG-4898 Review-driven changes.